link: Remove

The looking glass is the only consumer of the Link, and it's such a
basic wrapper around a button that it's not worth it.

https://bugzilla.gnome.org/show_bug.cgi?id=679944

diff --git a/js/Makefile.am b/js/Makefile.am
index 5c56c9c426b44445af58154770a529439eb38005..02ab5d94960b60a3bd89dfd2b437be4615b96e63 100644 (file)
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -57,7 +57,6 @@ nobase_dist_js_DATA =         \
        ui/keyringPrompt.js     \
        ui/layout.js            \
        ui/lightbox.js          \
-       ui/link.js              \
        ui/lookingGlass.js      \
        ui/magnifier.js         \
        ui/magnifierDBus.js     \

diff --git a/js/ui/link.js b/js/ui/link.js
deleted file mode 100644 (file)
index 765f695..0000000
--- a/js/ui/link.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const Link = new Lang.Class({
-    Name: 'Link',
-
-    _init : function(props) {
-        let realProps = { reactive: true,
-                          track_hover: true,
-                          style_class: 'shell-link' };
-        // The user can pass in reactive: false to override the above and get
-        // a non-reactive link (a link to the current page, perhaps)
-        Lang.copyProperties(props, realProps);
-
-        this.actor = new St.Button(realProps);
-    }
-});
-Signals.addSignalMethods(Link.prototype);

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index d28d2a2e648d8eeaa010db6347752c584395f08a..68ab8ca829f83d5b295c1612c6050637a79942ce 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -17,7 +17,6 @@ const System = imports.system;
 const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionUtils = imports.misc.extensionUtils;
-const Link = imports.ui.link;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;
@@ -264,7 +263,6 @@ function objectToString(o) {
 
 const ObjLink = new Lang.Class({
     Name: 'ObjLink',
-    Extends: Link.Link,
 
     _init: function(o, title) {
         let text;
@@ -275,7 +273,10 @@ const ObjLink = new Lang.Class({
         text = GLib.markup_escape_text(text, -1);
         this._obj = o;
 
-        this.parent({ label: text });
+        this.actor = new St.Button({ reactive: true,
+                                     track_hover: true,
+                                     style_class: 'shell-link',
+                                     label: text });
         this.actor.get_child().single_line_mode = true;
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
     },
@@ -799,24 +800,33 @@ const Extensions = new Lang.Class({
                                    text: this._stateToString(extension.state) });
         metaBox.add(state);
 
-        let viewsource = new Link.Link({ label: _("View Source") });
-        viewsource.actor._extension = extension;
-        viewsource.actor.connect('clicked', Lang.bind(this, this._onViewSource));
-        metaBox.add(viewsource.actor);
+        let viewsource = new St.Button({ reactive: true,
+                                         track_hover: true,
+                                         style_class: 'shell-link',
+                                         label: _("View Source") });
+        viewsource._extension = extension;
+        viewsource.connect('clicked', Lang.bind(this, this._onViewSource));
+        metaBox.add(viewsource);
 
         if (extension.metadata.url) {
-            let webpage = new Link.Link({ label: _("Web Page") });
-            webpage.actor._extension = extension;
-            webpage.actor.connect('clicked', Lang.bind(this, this._onWebPage));
-            metaBox.add(webpage.actor);
+            let webpage = new St.Button({ reactive: true,
+                                          track_hover: true,
+                                          style_class: 'shell-link',
+                                          label: _("Web Page") });
+            webpage._extension = extension;
+            webpage.connect('clicked', Lang.bind(this, this._onWebPage));
+            metaBox.add(webpage);
         }
 
-        let viewerrors = new Link.Link({ label: _("Show Errors") });
-        viewerrors.actor._extension = extension;
-        viewerrors.actor._parentBox = box;
-        viewerrors.actor._isShowing = false;
-        viewerrors.actor.connect('clicked', Lang.bind(this, this._onViewErrors));
-        metaBox.add(viewerrors.actor);
+        let viewerrors = new St.Button({ reactive: true,
+                                         track_hover: true,
+                                         style_class: 'shell-link',
+                                         label: _("Show Errors") });
+        viewerrors._extension = extension;
+        viewerrors._parentBox = box;
+        viewerrors._isShowing = false;
+        viewerrors.connect('clicked', Lang.bind(this, this._onViewErrors));
+        metaBox.add(viewerrors);
 
         return box;
     }